From c4159bc7a306ec97d2fa167e9980a11866663f8c Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Tue, 14 Oct 2008 21:29:44 -0700 Subject: [PATCH] Fix vc-mode's handling of temporary buffers. --- debian/changelog | 7 +++- .../do-not-show-vc-internal-tmp-buffers.diff | 40 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 debian/patches/do-not-show-vc-internal-tmp-buffers.diff diff --git a/debian/changelog b/debian/changelog index 4bf73a71f31..cd59efc9113 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,12 @@ emacs22 (22.2+2-4) unstable; urgency=medium * Invoke xmlstarlet from flymake as xmlstarlet rather than xml. Thanks to Jussi Judin . (closes: 447378) - -- Rob Browning Tue, 14 Oct 2008 21:22:59 -0700 + * Fix vc-mode's handling of internal temporary buffers. This should + avoid failures when trying to open files under monotone version + control. Thanks to Sven Joachim and Michael Berg + . (closes: #476108) + + -- Rob Browning Tue, 14 Oct 2008 21:28:47 -0700 emacs22 (22.2+2-3) unstable; urgency=medium diff --git a/debian/patches/do-not-show-vc-internal-tmp-buffers.diff b/debian/patches/do-not-show-vc-internal-tmp-buffers.diff new file mode 100644 index 00000000000..fa2701c8de3 --- /dev/null +++ b/debian/patches/do-not-show-vc-internal-tmp-buffers.diff @@ -0,0 +1,40 @@ +* A problem with vc mode's handling of temporary buffers has been fixed. + Patch: do-not-show-vc-internal-tmp-buffers.diff + Provided-by: Sven Joachim + Originally-reported-by: Michael Berg + Date: Mon, 14 Apr 2008 14:36:05 UTC + Added-by: Rob Browning + Status: incorporated upstream + Bug: 476108 + + Emacs should no longer fail when trying to open files under monotone + version control. + + From the upstream ChangeLog: + + 2008-03-29 Stefan Monnier + + * vc.el (vc-do-command): Don't show internal temp buffers. + +Index: sid/lisp/vc.el +=================================================================== +--- sid.orig/lisp/vc.el ++++ sid/lisp/vc.el +@@ -1047,9 +1047,14 @@ + (when (and (not (eq t okstatus)) + (or (not (integerp status)) + (and okstatus (< okstatus status)))) +- (pop-to-buffer (current-buffer)) +- (goto-char (point-min)) +- (shrink-window-if-larger-than-buffer) ++ ;; Don't show internal temp buffers. Especially since, together ++ ;; with with-temp-buffer and pop-up-frames, this can result in ++ ;; bugs where with-temp-buffer ends up not preserving ++ ;; current-buffer (because kill-buffer doesn't preserve it). ++ (unless (eq ?\s (aref (buffer-name (current-buffer)) 0)) ++ (pop-to-buffer (current-buffer)) ++ (goto-char (point-min)) ++ (shrink-window-if-larger-than-buffer)) + (error "Running %s...FAILED (%s)" command + (if (integerp status) (format "status %d" status) status)))) + (if vc-command-messages diff --git a/debian/patches/series b/debian/patches/series index f5560549cbe..4f7d095a0d6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,4 +14,5 @@ look-for-news-to-find-etc.diff fix-woman2-th.diff fix-python-module-handling-cve-2008-3949.diff fix-flymake-xmlstarlet-invocation.diff +do-not-show-vc-internal-tmp-buffers.diff autofiles.diff -- 2.30.2